From 54ab98a715e406e01df8ec7680052e824f8e354e Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Sun, 26 Aug 2018 13:19:42 +0100 Subject: [PATCH] x86/pt: make it build with !CONFIG_HVM This requires providing stubs for a few functions which are part of HVM code. Signed-off-by: Wei Liu Reviewed-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/include/asm-x86/hvm/io.h | 5 +++++ xen/include/asm-x86/hvm/vmx/vmx.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index e6b6ed0b92..8c83fd0c8b 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -125,7 +125,12 @@ void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq, const union vioapic_redir_entry *ent); void msix_write_completion(struct vcpu *); + +#ifdef CONFIG_HVM void msixtbl_init(struct domain *d); +#else +static inline void msixtbl_init(struct domain *d) {} +#endif /* Arch-specific MSI data for vPCI. */ struct vpci_arch_msi { diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index 89619e4afd..4966f725be 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -611,8 +611,13 @@ void p2m_init_hap_data(struct p2m_domain *p2m); void vmx_pi_per_cpu_init(unsigned int cpu); void vmx_pi_desc_fixup(unsigned int cpu); +#ifdef CONFIG_HVM void vmx_pi_hooks_assign(struct domain *d); void vmx_pi_hooks_deassign(struct domain *d); +#else +static inline void vmx_pi_hooks_assign(struct domain *d) {} +static inline void vmx_pi_hooks_deassign(struct domain *d) {} +#endif #define APIC_INVALID_DEST 0xffffffff -- 2.30.2